bitkeeper revision 1.984 (40d46ea9vfESAZLlQ90uqCG0OpF4EQ)

More cleanups.

diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c
index c53f52161cbe8bda72a5de1aeca90a1d29dbb02a..947478a09a0ffef54a10e1ce15ddad963adfbdca 100644 (file)
--- a/xen/arch/x86/flushtlb.c
+++ b/xen/arch/x86/flushtlb.c
@@ -9,7 +9,7 @@
 
 #include <xen/config.h>
 #include <xen/sched.h>
-#include <xen/interrupt.h>
+#include <xen/softirq.h>
 #include <asm/flushtlb.h>
 
 u32 tlbflush_clock;

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index 42d8ab20287bb7836767193073089b428952705a..2067b628e94c2935ac3dcefa6c288327110e78d4 100644 (file)
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -10,9 +10,7 @@
 #include <asm/ptrace.h>
 #include <xen/errno.h>
 #include <xen/sched.h>
-#include <xen/interrupt.h>
 #include <xen/irq.h>
-
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 41371307106adcff2d7b16e4e4adebd1a2020eae..6e80ed571c37623c7fce1078b468eb3e057243cf 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -22,7 +22,6 @@
 
 #include <xen/config.h>
 #include <xen/init.h>
-#include <xen/interrupt.h>
 #include <xen/irq.h>
 #include <xen/delay.h>
 #include <xen/sched.h>

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index c714706a4488f05d8c5167d4b1e36012c771dae5..1a5eb0b8d21f0de4eac3c0686b6ddf2735e28cdc 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -8,7 +8,6 @@
 #include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/event.h>
-#include <xen/interrupt.h>
 #include <xen/irq.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>